From ad7880a590742646ecc1c870a9fc935318a9b174 Mon Sep 17 00:00:00 2001 From: Sven Herzberg Date: Sat, 6 Sep 2008 17:26:33 +0000 Subject: [PATCH] =?utf8?q?Bug=20551063=20=E2=80=93=20deprecated=20marking?= =?utf8?q?=20without=20a=20link=20to=20what=20new=20code=20should?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-09-06 Sven Herzberg Bug 551063 – deprecated marking without a link to what new code should use * gdk/tmpl/input.sgml: dropped tmpl documentation for gdk_input_add() and gdk_input_add_full() * gdk/gdkevents.c: added inline documentation for gdk_input_add() and gdk_input_add_full(); added replacement hints into the deprecation message svn path=/trunk/; revision=21305 --- ChangeLog | 9 +++++++++ docs/reference/ChangeLog | 8 ++++++++ docs/reference/gdk/tmpl/input.sgml | 30 +++++++--------------------- gdk/gdkevents.c | 32 ++++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index a693df95db..2c58446c2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-09-06 Sven Herzberg + + Bug 551063 – deprecated marking without a link to what new code should + use + + * gdk/gdkevents.c: added inline documentation for gdk_input_add() and + gdk_input_add_full(); added replacement hints into the deprecation + message + 2008-09-05 Michael Natterer * gtk/gtkfilechooserdefault.c (file_list_drag_data_received_cb): diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 848de72ec6..7af44421ba 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,11 @@ +2008-09-06 Sven Herzberg + + Bug 551063 – deprecated marking without a link to what new code should + use + + * gdk/tmpl/input.sgml: dropped tmpl documentation for gdk_input_add() + and gdk_input_add_full() + 2008-09-06 Stefan Kost * gdk-pixbuf/gdk-pixbuf-csource.xml: diff --git a/docs/reference/gdk/tmpl/input.sgml b/docs/reference/gdk/tmpl/input.sgml index 87e3aa2f10..0226a2a466 100644 --- a/docs/reference/gdk/tmpl/input.sgml +++ b/docs/reference/gdk/tmpl/input.sgml @@ -35,19 +35,14 @@ callbacks. - -Establish a callback when a condition becomes true on -a file descriptor. - -@source: a file descriptor. -@condition: the condition. -@function: the callback function. -@data: callback data passed to @function. -@destroy: callback function to call with @data when the input - handler is removed. -@Returns: a tag that can later be used as an argument to - gdk_input_remove(). + +@source: +@condition: +@function: +@data: +@destroy: +@Returns: @@ -88,17 +83,6 @@ structure or object that @data points to. - -Establish a callback when a condition becomes true on -a file descriptor. - - -@source: a file descriptor. -@condition: the condition. -@function: the callback function. -@data: callback data passed to @function. -@Returns: a tag that can later be used as an argument to - gdk_input_remove(). diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index fde9ab125a..24a29a1fd9 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -1015,6 +1015,23 @@ gdk_io_invoke (GIOChannel *source, return TRUE; } +/** + * gdk_input_add_full: + * @source: a file descriptor. + * @condition: the condition. + * @function: the callback function. + * @data: callback data passed to @function. + * @destroy: callback function to call with @data when the input + * handler is removed. + * + * Establish a callback when a condition becomes true on + * a file descriptor. + * + * Returns: a tag that can later be used as an argument to + * gdk_input_remove(). + * + * Deprecated: Use g_io_add_watch_full() on a #GIOChannel + */ gint gdk_input_add_full (gint source, GdkInputCondition condition, @@ -1048,6 +1065,21 @@ gdk_input_add_full (gint source, return result; } +/** + * gdk_input_add: + * @source: a file descriptor. + * @condition: the condition. + * @function: the callback function. + * @data: callback data passed to @function. + * + * Establish a callback when a condition becomes true on + * a file descriptor. + * + * Returns: a tag that can later be used as an argument to + * gdk_input_remove(). + * + * Deprecated: Use g_io_add_watch() on a #GIOChannel + */ gint gdk_input_add (gint source, GdkInputCondition condition, -- 2.30.2